Add informative messages for common problems. (#137974, Owen Taylor)

Fri May 28 14:57:13 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkwidget.c (gtk_widget_set_parent): Add informative
	messages for common problems.  (#137974, Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 9f7bee17a516998121dc781633d63a71c536c143..ea864865a7bbdbbc3db95fcc90dc90dfa5e6698e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 28 15:00:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative
+       messages for common problems.  (#137974, Owen Taylor)
+
 Fri May 28 14:20:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9f7bee17a516998121dc781633d63a71c536c143..ea864865a7bbdbbc3db95fcc90dc90dfa5e6698e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri May 28 15:00:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative
+       messages for common problems.  (#137974, Owen Taylor)
+
 Fri May 28 14:20:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9f7bee17a516998121dc781633d63a71c536c143..ea864865a7bbdbbc3db95fcc90dc90dfa5e6698e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri May 28 15:00:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative
+       messages for common problems.  (#137974, Owen Taylor)
+
 Fri May 28 14:20:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9f7bee17a516998121dc781633d63a71c536c143..ea864865a7bbdbbc3db95fcc90dc90dfa5e6698e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri May 28 15:00:01 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkwidget.c (gtk_widget_set_parent): Add informative
+       messages for common problems.  (#137974, Owen Taylor)
+
 Fri May 28 14:20:17 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/x11/gdkevents-x11.c: Fix off-by-one allocation 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d1f5208fdb816cb8ad2dde8e307e48e09cfb2f25..75d252da0230e43c5e1152b35110931d40d56457 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4253,10 +4253,18 @@ gtk_widget_set_parent (GtkWidget *widget,
   GtkStateData data;
   
   g_return_if_fail (GTK_IS_WIDGET (widget));
-  g_return_if_fail (widget->parent == NULL);
-  g_return_if_fail (!GTK_WIDGET_TOPLEVEL (widget));
   g_return_if_fail (GTK_IS_WIDGET (parent));
   g_return_if_fail (widget != parent);
+  if (widget->parent != NULL)
+    {
+      g_warning ("Can't set a parent on widget which has a parent\n");
+      return;
+    }
+  if (GTK_WIDGET_TOPLEVEL (widget))
+    {
+      g_warning ("Can't set a parent on a toplevel widget\n");
+      return;
+    }
 
   /* keep this function in sync with gtk_menu_attach_to_widget()
    */